From: awilliam@xenbuild.aw <awilliam@xenbuild.aw>
Date: Mon, 8 May 2006 19:05:47 +0000 (-0600)
Subject: [IA64] fix initrd start
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16111
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=6fc064b18451107b7835e1ac1514315538797d03;p=xen.git

[IA64] fix initrd start

Fix initrd start to work with P2M/VP

Signed-off-by: Akio Takebe <takebe_akio@jp.fujitsu.com>
---

diff --git a/xen/arch/ia64/xen/dom_fw.c b/xen/arch/ia64/xen/dom_fw.c
index a7d3373da8..8d0b7801c5 100644
--- a/xen/arch/ia64/xen/dom_fw.c
+++ b/xen/arch/ia64/xen/dom_fw.c
@@ -1019,7 +1019,8 @@ dom_fw_init (struct domain *d, const char *args, int arglen, char *fw_mem, int f
 	if (d == dom0) {
 		// XXX CONFIG_XEN_IA64_DOM0_VP
 		// initrd_start address is hard coded in start_kernel()
-		bp->initrd_start = ia64_boot_param->initrd_start;
+		bp->initrd_start = (dom0_start+dom0_size) -
+		  (PAGE_ALIGN(ia64_boot_param->initrd_size) + 4*1024*1024);
 		bp->initrd_size = ia64_boot_param->initrd_size;
 	}
 	else {
diff --git a/xen/arch/ia64/xen/xensetup.c b/xen/arch/ia64/xen/xensetup.c
index caf8d5fe48..01c4de3461 100644
--- a/xen/arch/ia64/xen/xensetup.c
+++ b/xen/arch/ia64/xen/xensetup.c
@@ -415,8 +415,7 @@ printk("About to call domain_create()\n");
     printk("About to call construct_dom0()\n");
     dom0_memory_start = (unsigned long) __va(initial_images_start);
     dom0_memory_size = ia64_boot_param->domain_size;
-    dom0_initrd_start = (unsigned long) __va(initial_images_start +
-			     PAGE_ALIGN(ia64_boot_param->domain_size));
+    dom0_initrd_start = (unsigned long) __va(ia64_boot_param->initrd_start);
     dom0_initrd_size = ia64_boot_param->initrd_size;
  
     if ( construct_dom0(dom0, dom0_memory_start, dom0_memory_size,